[automerger skipped] Resolve custom printer icon boundary exploit. am:...

[automerger skipped] Resolve custom printer icon boundary exploit. am: ab9b96c8 -s ours am: a3960422 -s ours am: 010d939c -s ours am: 75264dd0 -s ours am: 4cbc9898 -s ours

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

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



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