[automerger skipped] Resolve StatusHints image exploit across user. am: 9f721a6718 am: f695eb04c4 -s ours

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

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

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