Merge "Follow class package change: LocaleList" into nyc-dev am: c80ac6dc90 am: 8c7fcef8b1
am: 9f7cb9eb20

* commit '9f7cb9eb208a7bdc9f7f43b7c43d2fda937c570d':
  Follow class package change: LocaleList

Change-Id: If5dd9de4e4a98986384eac9b185680cdd0705ab4