Merge "Resolve cross-user image exploit for conference status hints" into...

Merge "Resolve cross-user image exploit for conference status hints" into sc-dev am: 7a697439 am: 01055f01

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



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