Merge changes from topic "am-b7175fd35b0a4f71864ad398fc938238" into udc-qpr-dev-plus-aosp

* changes:
  Merge "[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into sc-dev am: 5f83b305 am: 2abcf8bb am: 9f168252 am: f891e723 am: 393b9d9d -s ours am: 2d7b4aaa -s ours am: 35faa737 -s ours am: 10ce88cb -s ours" into udc-d1-dev-plus-aosp am: b60d6c61 -s ours
  [automerger skipped] Merge "Resolve custom printer icon boundary exploit." into sc-dev am: 5f83b305 am: 2abcf8bb am: 9f168252 am: f891e723 am: 393b9d9d -s ours am: 2d7b4aaa -s ours am: 35faa737 -s ours am: 10ce88cb -s ours am: ef8f1842 -s ours