Merge "Resolve StatusHints image exploit across user." into rvc-dev am: 543e6feb

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



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