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

[automerger skipped] Fix the security vulnerability issue in AppLocalePickerActivity am: 33ef8379 am: 406abc4d -s ours

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

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



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