Merge "[automerger skipped] Merge "Resolve StatusHints image exploit across...

Merge "[automerger skipped] Merge "Resolve StatusHints image exploit across user." into rvc-dev am: 543e6feb am: 8c3d465b am: da5c254e am: 1a48c2ff -s ours am: fb2016a8 -s ours am: 6635847b -s ours am: c14fae86 -s ours am: 14dedcc0 -s ours am: ebe14ec7 -s ours am: a1c2325e -s ours" into udc-qpr-dev-plus-aosp am: ba274e6b -s ours

am skip reason: Merged-In I6e70e238b3a5ace1cab41ec5796a6bb4d79769f2 with SHA-1 48223d60 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23547516



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