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