[automerger skipped] Resolve custom printer icon boundary exploit. am: f83f592d6d -s ours am: 95a36b4aef -s ours am: 0c86c64271 -s ours am: 8d2770dbc1 -s ours am: 2bdfb7cf37 -s ours am: 2733e73adb -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/+/24109874
Change-Id: I2dedb5129156c60a2f8fda5ed02d06fcf26f2856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: