[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into sc-v2-dev am: c546ee6ad1 -s ours am: 5b3024f3ba -s ours am: e40584e5aa -s ours am: 3cdf69f3c7 -s ours am: 9b3f9419ca -s ours am: aca3acc985 -s ours am: ad9c46f2bd -s ours am: f865b17b3d -s ours

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

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

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