Resolve StatusHints image exploit across user. am: f043c230b6

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

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