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: c452fe1a am: db453f10

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



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