Merge "Resolve custom printer icon boundary exploit." into sc-dev am: 5f83b305

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



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