[conflict] Resolve StatusHints image exploit across user. am: a853f6ba

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/23463634



Fixes: 285211549
Fixes: 280797684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:41042bd0c8e1e47c19dfdb2a378c70d2090b1e15)
Merged-In: I69b0c64413ce3b5e8f56c4fbc5e195a5f5adb6d7
Change-Id: I69b0c64413ce3b5e8f56c4fbc5e195a5f5adb6d7