Merge "Resolve StatusHints image exploit across user." into sc-v2-dev am: e371b301

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



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