[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into sc-dev am: 5f83b3051b am: 2abcf8bb5f am: 9f168252b3 am: f891e723e4 am: f2aa5eb013 -s ours am: 3b44fa020a -s ours
am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 ab9b96c864 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24112147
Change-Id: I85a5e25dc5dbfbad51f9a23872f79002d364e0af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: