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

[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into tm-dev am: 437207f5 -s ours am: 3b782ec1 -s ours am: a4fdb271 -s ours am: be1c91eb -s ours am: 4698fb77 -s ours am: fadb5e46 -s ours

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

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



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