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

[automerger skipped] Resolve StatusHints image exploit across user. am: 9f721a67 am: f695eb04 -s ours am: 0d82479e -s ours am: 4a74bdf4 -s ours am: 13bfc114 -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/+/23438954



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