Merge changes from topic "am-79d97757018649de82b58637e5c5a33d" into main

* changes:
  [automerger skipped] Merge changes from topic "am-e5c2b8257a1143ecbadb4dd35fd2daee" into udc-d1-dev-plus-aosp am: d739f579 -s ours am: 45a9fed7 -s ours
  [automerger skipped] Merge "Resolve custom printer icon boundary exploit." into sc-qpr1-dev am: 34e5a7d7 -s ours am: e3be9057 -s ours am: a9d4f354 -s ours am: 4f6b2e8d -s ours am: 73d85330 -s ours am: 9f83af80 -s ours am: 2b85503c -s ours am: bcc4c8f9 -s ours