Merge "Resolve custom printer icon boundary exploit." into rvc-dev am: abd2a232

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



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