[automerger skipped] Resolve custom printer icon boundary exploit. am: 658ed370a3 -s ours am: cfce4ff735 -s ours
am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 0e0693ca9c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24108355
Change-Id: I83f5e736a707941a8a3f1c7c54254684fa4b3433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: