Merge "Follow class package change: LocaleList" into nyc-dev
am: c80ac6dc90

* commit 'c80ac6dc90722a139457ff68ca687ba6acde8a2b':
  Follow class package change: LocaleList

Change-Id: I0ea61b4b5e518dba6beda8ae43dee578d8d15380