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

[automerger skipped] Resolve custom printer icon boundary exploit. am: 39f57376 -s ours am: 28003667 -s ours am: 6e7c1338 -s ours

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

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



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