Resolve StatusHints image exploit across user. am: 9f721a6718 am: 8871b7b097

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

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