[automerger skipped] Merge "Resolve cross account user icon validation." into...

[automerger skipped] Merge "Resolve cross account user icon validation." into sc-dev am: 9500429c am: 01e8b84a am: a44093b9 am: 997f3dc2 am: c4739d27 am: c5500626 am: 9a66fd6f -s ours

am skip reason: Merged-In I25614ead889501f4553ed2b42b366e09a47b0c9f with SHA-1 9a260d5e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/31157005



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