[automerger skipped] Merge "Fix the security vulnerability issue in...

[automerger skipped] Merge "Fix the security vulnerability issue in AppLocalePickerActivity" into tm-qpr-dev am: 1739114d am: 3f4d63b9 -s ours

am skip reason: Merged-In I2e25a308bcba6ea0edee89c7a78465f766bdbeac with SHA-1 ed9cbdea is already in history

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



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