[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into tm-qpr-dev am: 161b61dd3e -s ours am: e368233112 -s ours am: 9ed01ce5ca -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: I91071eae2ad0a1db9faba7c365e39d43d88eeaef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: