[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: a099cf12 -s ours am: 140906f5 -s ours am: 06b2b1ab -s ours am: 0bcbd86b -s ours am: f40ebc7a -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: I5851da8233155b9d96aa1e986e19a06acfc73071
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>