[automerger skipped] Merge "Resolve custom printer icon boundary exploit."...

[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into rvc-qpr-dev am: 91771262 -s ours am: f1f578c3 -s ours am: 69226025 -s ours am: 8fd7bfde -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/+/24108355



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