[automerger skipped] Resolve account image icon profile boundary exploit. am:...

[automerger skipped] Resolve account image icon profile boundary exploit. am: a604311f am: 13980cb7 am: 46031022 am: 9bbf25ed am: a4bc335e am: 733a8f6b am: 0f844fc0 -s ours am: 03669b92 -s ours am: 25a966f6 -s ours

am skip reason: Merged-In I2b6418f019a373ee9f02ba8683e5b694e7ab80a5 with SHA-1 e7d0ca3f is already in history

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



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