[automerger skipped] Merge "Fix security issue" into rvc-qpr-dev am:...

[automerger skipped] Merge "Fix security issue" into rvc-qpr-dev am: 2c61777f am: ebb056fa -s ours am: d53c6409 -s ours

am skip reason: Change-Id I657de039d667f5aee0941336e9361ae04f056c33 with SHA-1 159bd0e9 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id979960d9f56499be6f6e77566767c9c95f32537