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 am: 74068360 am: 642bf8c1

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



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