Merge changes from topic "am-e47ad970db264cefacfa1740565126dd" into udc-d1-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: 6a3c884c -s ours am: dd0c659e -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: a4990ebd -s ours am: 3a64e8dc -s ours