[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into rvc-qpr-dev am: 91771262b1 -s ours

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

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

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