Merge changes from topic "am-29abd21d17dc450a9363f42b5b9f7972" into udc-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into sc-qpr1-dev am: 34e5a7d750 -s ours am: e3be905762 -s ours am: a9d4f35475 -s ours am: 15cf362fb6 -s ours am: 1dedaa2adf -s ours am: 572385b390 -s ours am: b7203061d7 -s ours am: 640aea3db9 -s ours
[automerger skipped] Resolve custom printer icon boundary exploit. am: f83f592d6d -s ours am: 95a36b4aef -s ours am: 0c86c64271 -s ours am: 8d2770dbc1 -s ours am: 2bdfb7cf37 -s ours am: 2733e73adb -s ours am: fa94052838 -s ours am: 571527c0ac -s ours