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

[automerger skipped] Resolve custom printer icon boundary exploit. am: 7cfc4727 -s ours am: e4171843 -s ours am: 1e9a8a4e -s ours

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

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



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