[automerger skipped] Merge "Resolve StatusHints image exploit across user." into udc-dev am: 366a6dea am: bc51c611 am: b0478076 -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/+/23438702



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