[automerger skipped] Merge "Resolve custom printer icon boundary exploit."...

[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into tm-qpr-dev am: 161b61dd -s ours am: e3682331 -s ours

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

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



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