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

Merge "[automerger skipped] Resolve StatusHints image exploit across user. am: f043c230 am: 8ac0a8e2 -s ours am: 11c1ba63 -s ours am: c3cb9be6 -s ours am: afb65f14 -s ours" into udc-qpr-dev-plus-aosp am: abd6b457 -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/+/23438531



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