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

[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into sc-dev am: 5f83b305 am: 2abcf8bb am: 9f168252 am: f891e723 am: f2aa5eb0 -s ours am: 3b44fa02 -s ours am: 5cea4714 -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: Ia2d7f88228d2c4ccb849583871d8232189781c5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>