Merge "Use app\'s best locale if they override LocaleList" into nyc-dev
am: fbf3a0964a

* commit 'fbf3a0964a458508f834bffd18198394037bb5c1':
  Use app's best locale if they override LocaleList

Change-Id: I5a38d95f1ea7d7fd676fa60effa467af219c75cf