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

[automerger skipped] Resolve custom printer icon boundary exploit. am: 658ed370 -s ours am: cfce4ff7 -s ours am: b4f03d1e -s ours am: cdf541a5 -s ours am: dbd499f0 -s ours

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

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



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