Merge "Merge "Use app\'s best locale if they override LocaleList" into nyc-dev...
Merge "Merge "Use app\'s best locale if they override LocaleList" into nyc-dev am: fbf3a096 am: ade0bce3" into nyc-mr1-dev-plus-aosp
am: 27bc36a8
* commit '27bc36a8':
Change-Id: Ic8260551317c2148f9faede2a742dffde921b533