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

[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: c7f83f05 -s ours

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

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



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