[automerger skipped] [conflict] Resolve StatusHints image exploit across user....

[automerger skipped] [conflict] Resolve StatusHints image exploit across user. am: a853f6ba am: 41042bd0 -s ours am: 3053d395 -s ours am: 7ee8fb5a -s ours am: b80fdd49 -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: I3c86af4397db88fc518d16aacd07fb8d52d2f2c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>