[automerger skipped] Merge "[conflict] Resolve StatusHints image exploit...

[automerger skipped] Merge "[conflict] Resolve StatusHints image exploit across user. am: a853f6ba" into tm-dev am: 8ce3e195 -s ours am: ea798e3e -s ours am: 07adc443 -s ours

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

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



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