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

[automerger skipped] Resolve custom printer icon boundary exploit. am: f83f592d -s ours am: 95a36b4a -s ours am: 0c86c642 -s ours am: 412108db -s ours am: 39c2f382 -s ours am: e820629f -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/+/24109874



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