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

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



Fixes: 285650146
Fixes: 280797684
Change-Id: I7822bf2bb75c775faaaa7023fd2c9af9f6d6888f
Merged-In: I6e70e238b3a5ace1cab41ec5796a6bb4d79769f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>