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

Merge "[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: 830aaef3 -s ours am: fe68d633 -s ours am: fa373d84 -s ours am: 5c19c9d0 -s ours am: fbf980ae -s ours" into udc-d1-dev-plus-aosp am: 6f28d490 -s ours

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

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



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