Merge "Resolve cross-user image exploit for conference status hints" into sc-dev am: 7a69743951 am: 01055f014b am: 7406836051 am: 642bf8c1fb am: 9c4646012b

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

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