[conflict] Resolve StatusHints image exploit across user. am: 49d19dd265 am: 2a10deb1a0

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

Fixes: 285650146
Fixes: 280797684
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:496ccffe5e76be72287132715fb2b43a746cacf9)
Merged-In: Icf8d87d43bd5fd3c23f317de52d7f18e2748f6a1
Change-Id: Icf8d87d43bd5fd3c23f317de52d7f18e2748f6a1

Change-Id: I34bfe8a6564d3f2c941ce615d0a27e8d1eb3624c
6 files changed