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

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



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