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

* changes:
  [automerger skipped] Merge "Resolve custom printer icon boundary exploit." into rvc-qpr-dev am: 91771262 -s ours am: f1f578c3 -s ours am: 69226025 -s ours am: 8fd7bfde -s ours am: 8badb22c -s ours am: ccd47c5f -s ours am: a491053f -s ours am: 22e4491d -s ours am: 8fc807eb -s ours
  [automerger skipped] Resolve custom printer icon boundary exploit. am: 658ed370 -s ours am: cfce4ff7 -s ours am: b4f03d1e -s ours am: cdf541a5 -s ours am: dbd499f0 -s ours am: e24c3a74 -s ours am: d6865ed7 -s ours am: b90ad186 -s ours am: c081a59c -s ours