Merge "Resolve StatusHints image exploit across user." into udc-dev am: 1582119d

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



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