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

* commit '8c7fcef8b15d557123d66e4fdfd4a3d0eea71c31':
  Follow class package change: LocaleList

Change-Id: I0ac27e3a512b8b8f3c515a4231a95c6b4e9f67b3