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

[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into sc-qpr1-dev am: 34e5a7d7 -s ours am: e3be9057 -s ours am: a9d4f354 -s ours am: 15cf362f -s ours am: 1dedaa2a -s ours am: 572385b3 -s ours am: b7203061 -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/+/24109874



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