Merge "Move LocaleList to avoid layering violation." into nyc-dev

am: 31884efd13

* commit '31884efd13b3ac60078edaa0b7e8a4b75d995538':
  Move LocaleList to avoid layering violation.

Change-Id: I45e9b7e834d2c5e515eb6c60885296358e7d786e

diff --cc api/current.txt
Simple merge

diff --cc api/system-current.txt
Simple merge

diff --cc api/test-current.txt
Simple merge

diff --cc core/java/android/provider/Settings.java
Simple merge

diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge