[automerger skipped] Merge "Resolve StatusHints image exploit across user." into rvc-dev am: 543e6febbf am: 8c3d465b5e am: da5c254ecb am: 1a48c2ff34 -s ours

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

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

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