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

* changes:
  [automerger skipped] Merge "Merge "Resolve StatusHints image exploit across user." into sc-v2-dev am: e371b301" into tm-dev am: a61b7c7f -s ours am: 4c433e43 -s ours am: 6e14b6bd -s ours am: 31a9d99b -s ours
  [automerger skipped] Merge "Resolve StatusHints image exploit across user." into sc-v2-dev am: e371b301 am: 3fc6dd50 -s ours am: be7f4c14 -s ours am: 46a16ddd -s ours am: 9ac0b894 -s ours