[automerger skipped] Resolve StatusHints image exploit across user. am: f043c230b6 am: 8ac0a8e265 -s ours am: 11c1ba6354 -s ours am: c3cb9be61a -s ours

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

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

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