Merge changes from topic "am-0f8ababda59d456f8ac0de10deb0ac38" into udc-qpr-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: 15e852fc -s ours am: ea0e4bae -s ours am: 16c8f450 -s ours am: 17681323 -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: 56b7b6de -s ours am: 6bec1988 -s ours am: b52e71fa -s ours am: f30ec0d5 -s ours