Merge "Fix the security vulnerability issue in AppLocalePickerActivity" into tm-qpr-dev am: 1739114d44

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

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