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 am: 9c464601 am: 0861adbd

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



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