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

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



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