Merge changes from topic "am-e5c2b8257a1143ecbadb4dd35fd2daee" into udc-d1-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: 4f6b2e8d -s ours am: 73d85330 -s ours am: 9f83af80 -s ours
  [automerger skipped] Resolve custom printer icon boundary exploit. am: f83f592d -s ours am: 95a36b4a -s ours am: 0c86c642 -s ours am: 412108db -s ours am: 39c2f382 -s ours am: e820629f -s ours