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: 34e5a7d7 -s ours am: e3be9057 -s ours am: a9d4f354 -s ours am: 15cf362f -s ours am: 1dedaa2a -s ours am: 572385b3 -s ours am: b7203061 -s ours am: 640aea3d -s ours
  [automerger skipped] Resolve custom printer icon boundary exploit. am: f83f592d -s ours am: 95a36b4a -s ours am: 0c86c642 -s ours am: 8d2770db -s ours am: 2bdfb7cf -s ours am: 2733e73a -s ours am: fa940528 -s ours am: 571527c0 -s ours