Merge changes from topic "am-bdbb104af243433a896ac7645c3c5b93" 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: e40584e5 -s ours am: 3cdf69f3 -s ours am: 9b3f9419 -s ours am: aca3acc9 -s ours
  [automerger skipped] Resolve custom printer icon boundary exploit. am: 7cfc4727 -s ours am: e4171843 -s ours am: 1e9a8a4e -s ours am: 3b2129e5 -s ours am: fd504299 -s ours am: ed8ae455 -s ours