Resolve account image icon profile boundary exploit. am: a604311f86 am: 13980cb7c8

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

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