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

[automerger skipped] Merge "Resolve StatusHints image exploit across user." into sc-v2-dev am: e371b301 am: 3fc6dd50 -s ours am: be7f4c14 -s ours am: 46a16ddd -s ours am: 9ac0b894 -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: I449ebff47c0cdddef52cf583f9e72acc1abf9509
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>