[automerger skipped] Resolve StatusHints image exploit across user. am:...

[automerger skipped] Resolve StatusHints image exploit across user. am: 9f721a67 am: 8871b7b0 am: 01eec5d0 am: 98e5d808 -s ours am: 99719cd4 -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/+/23438954



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