Merge changes from topic "am-11804f48f274487d903efa686c0b408d" 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: 2d9cad05 -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: 63713b7d -s ours