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

[automerger skipped] Merge "Merge "Resolve StatusHints image exploit across user." into sc-v2-dev am: e371b301" into tm-dev am: a61b7c7f -s ours am: f6121d36 -s ours am: 56b02f61 -s ours am: a8190279 -s ours

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

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



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