[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: 8badb22c -s ours am: 15e852fc -s ours am: ea0e4bae -s ours am: 16c8f450 -s ours am: 17681323 -s ours am: 3f4cdd35 -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: I7f472e44e04abb5de4b5690640bd72aef9088dc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>