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

[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into sc-v2-dev am: c546ee6a -s ours am: 5b3024f3 -s ours am: e40584e5 -s ours am: 3cdf69f3 -s ours am: 9b3f9419 -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/+/24109875



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