[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: 26bd13e0 -s ours am: 121bb617 -s ours am: 2d9cad05 -s ours am: a814b906 -s ours am: 9ee0de3b -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: Ia6ddfc083ad5cb487d7219b6f4800a9aaa990b45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>