[automerger skipped] Resolve account image icon profile boundary exploit. am: a604311f86 am: 13980cb7c8 am: 4603102279 am: 9bbf25ed9e am: a4bc335e6b am: 733a8f6b8d am: 4fd0e1e44d am: 3af8461ca5 -s ours am: db7db13aa6 -s ours am: 5d76129c49 -s ours am: f7d7362c89 -s ours

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

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

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