Merge "Resolve custom printer icon boundary exploit." into udc-dev am: 18012df2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24112149



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