[automerger skipped] Resolve custom printer icon boundary exploit. am: 7cfc47271c -s ours am: e41718434e -s ours am: 1e9a8a4e10 -s ours am: 3b2129e5f9 -s ours am: fd50429917 -s ours am: ed8ae455d2 -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: I9960db2aa5bd3b3920b5810bed0fd6ab6b366b58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>