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

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

Change-Id: Id823d52d6dec9456e6c16e621a4a0f8eff90f68f