Merge changes from topic "am-2860078308a34f39b65842736d7a6cab" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Resolve custom printer icon boundary exploit." into sc-v2-dev am: c546ee6a -s ours am: 5b3024f3 -s ours am: 26bd13e0 -s ours am: 121bb617 -s ours am: 09052180 -s ours
  [automerger skipped] Resolve custom printer icon boundary exploit. am: 7cfc4727 -s ours am: e4171843 -s ours am: e9e885e4 -s ours am: 3ade7677 -s ours am: 0c9be9d6 -s ours