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

[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into rvc-dev am: abd2a232 am: f4361774 -s ours am: 19e0cfd5 -s ours am: 6205fdea -s ours am: f75e6037 -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/+/24108354



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