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: 44e3f541 am: cab40a35 am: 67275bca

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



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