[automerger skipped] Merge "Resolve StatusHints image exploit across user." into udc-dev am: 366a6dea am: da3b5b13 -s ours am: 37ccc44a -s ours am: fd52fee5 -s ours

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

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



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