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: 977c6316 am: a33cc3f0

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



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