[automerger skipped] Merge "Fix security issue" into rvc-qpr-dev am: 2c61777f4b
am: ebb056faff
-s ours
am skip reason: Change-Id I657de039d667f5aee0941336e9361ae04f056c33 with SHA-1 159bd0e966
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: I9b46618c94d1f4a0ed852f5f66d04cf57c3d7f13
This commit is contained in: