Merge "Avoid getting app locale config for each app" into tm-dev am:...

Merge "Avoid getting app locale config for each app" into tm-dev am: 9d6cf425 am: 4d728de8 am: 25521257 am: 6156f00c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456663



Change-Id: I06aada123e3dec9e208d7c5ca8f10854ece1df32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>