Merge "Use app\'s best locale if they override LocaleList" into nyc-dev am:...
Merge "Use app\'s best locale if they override LocaleList" into nyc-dev am: fbf3a096 am: fbdf46f6
am: 0c2f681b
* commit '0c2f681b':
Use app's best locale if they override LocaleList
Change-Id: I9913e7466450a83bd5872abc62cfaac3d235d8d8