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: c546ee6ad1 -s ours am: 5b3024f3ba -s ours am: e40584e5aa -s ours am: 3cdf69f3c7 -s ours am: 9b3f9419ca -s ours am: aca3acc985 -s ours
  [automerger skipped] Resolve custom printer icon boundary exploit. am: 7cfc47271c -s ours am: e41718434e -s ours am: 1e9a8a4e10 -s ours am: 3b2129e5f9 -s ours am: fd50429917 -s ours am: ed8ae455d2 -s ours