[automerger skipped] Resolve StatusHints image exploit across user. am: f043c230b6 am: c79490fe50 am: 6fc5f6303f -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/+/23438531

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