[automerger skipped] Resolve custom printer icon boundary exploit. am: 7cfc47271c -s ours am: e41718434e -s ours am: e9e885e44a -s ours am: 3ade767736 -s ours

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

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

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