Merge "Resolve custom printer icon boundary exploit." into sc-dev am: 5f83b3051b am: 2abcf8bb5f am: 9f168252b3 am: f891e723e4

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

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