[automerger skipped] Merge "Resolve custom printer icon boundary exploit."...

[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into udc-dev am: 18012df2 am: 010c36ff -s ours am: 492980d6 -s ours am: 6839d20a -s ours

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

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



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