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

[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into udc-qpr-dev am: 95622586 am: f5239a6b -s ours

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

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



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