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

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

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