[automerger skipped] Merge "Resolve cross-user image exploit for conference...

[automerger skipped] 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 am: 269e794e am: ce832bd6 -s ours

am skip reason: Merged-In Ib9d701398d25d021cdb9abacbaa5b175f62bee1d with SHA-1 a8e2bf9c is already in history

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



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