[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into rvc-qpr-dev am: 91771262b1 -s ours am: f1f578c3f1 -s ours am: 6922602535 -s ours am: 8fd7bfdec1 -s ours am: 8badb22c1e -s ours am: ccd47c5f8f -s ours am: a491053f15 -s ours am: 22e4491da1 -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: Ib15161087c7928e53c4a786ecb8cfb0834f91c33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: