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

* changes:
  [automerger skipped] Merge "Resolve custom printer icon boundary exploit." into tm-dev am: 437207f5 -s ours am: a099cf12 -s ours am: 140906f5 -s ours am: 06b2b1ab -s ours
  [automerger skipped] Resolve custom printer icon boundary exploit. am: 39f57376 -s ours am: 4a977d71 -s ours am: 3cdf6eb7 -s ours am: 6e4426e3 -s ours