[automerger skipped] Resolve custom printer icon boundary exploit. am: 39f5737626 -s ours am: 4a977d71e8 -s ours am: 3cdf6eb741 -s ours

am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 f83f592d6d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24112148

Change-Id: Idc9784e1811562929d5b51731f31c73a83d731a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>