[automerger skipped] Merge "Resolve StatusHints image exploit across user."...

[automerger skipped] Merge "Resolve StatusHints image exploit across user." into udc-dev am: 1582119d am: d22b5345 -s ours

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

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



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