[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into sc-dev am: 5f83b3051b am: 2abcf8bb5f am: 9f168252b3 am: f891e723e4 am: 393b9d9df6 -s ours

am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 ab9b96c864 is already in history

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

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