[automerger skipped] Resolve StatusHints image exploit across user. am: f043c230 am: 8ac0a8e2 -s ours am: 11c1ba63 -s ours am: 8fc2c360 -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/+/23438531



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