Resolve StatusHints image exploit across user. am: f043c230b6 am: c79490fe50

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

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