Merge "Resolve cross account user icon validation." into sc-dev am: 9500429c am: 01e8b84a

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



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