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

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

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