Resolve cross account user icon validation. am: 7c87253b23 am: 9fa012fa9b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/31157119

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