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

* changes:
  [automerger skipped] Merge "Resolve custom printer icon boundary exploit." into tm-dev am: 437207f5 -s ours am: 3b782ec1 -s ours am: a4fdb271 -s ours am: be1c91eb -s ours am: bcaf8e4b -s ours
  [automerger skipped] Resolve custom printer icon boundary exploit. am: 39f57376 -s ours am: 28003667 -s ours am: 6e7c1338 -s ours am: b5e31e46 -s ours am: f614d372 -s ours