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

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

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



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