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

Merge "[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into sc-dev am: 5f83b305 am: 2abcf8bb am: 9f168252 am: f891e723 am: 393b9d9d -s ours am: 2d7b4aaa -s ours am: 35faa737 -s ours am: 10ce88cb -s ours" into udc-d1-dev-plus-aosp am: b60d6c61 -s ours

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

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



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