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

[automerger skipped] Fix the security vulnerability issue in AppLocalePickerActivity am: 33ef8379 am: 30c88f6f -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/+/21152842



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