Merge "Fix System language option missing and locale region missing issue"...

Merge "Fix System language option missing and locale region missing issue" into tm-dev am: 84f78bc4

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



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