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

Merge "Resolve custom printer icon boundary exploit." into sc-dev am: 5f83b305 am: 2abcf8bb am: 9f168252 am: f891e723

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



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