[automerger skipped] [conflict] Resolve StatusHints image exploit across user....

[automerger skipped] [conflict] Resolve StatusHints image exploit across user. am: 49d19dd2 am: 2a10deb1 am: 16291a3d am: 09bd0414 -s ours am: 27237c85 -s ours am: a33d2395 -s ours am: b97d97a3 -s ours am: bc121551 -s ours

am skip reason: Merged-In Ie1f6a8866d31d5f1099dd0630cf8e9ee782d389c with SHA-1 a853f6ba is already in history

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



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