[automerger skipped] Merge "Merge "Resolve StatusHints image exploit across user." into sc-v2-dev am: e371b3018f" into tm-dev am: a61b7c7f4a -s ours

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

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

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