Merge changes from topic "am-94172948375e4750a9157f3313bb26ed" into udc-qpr-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: f6121d36 -s ours am: 56b02f61 -s ours am: 4c2c7c40 -s ours am: e0a8a22e -s ours
  [automerger skipped] Merge "Resolve StatusHints image exploit across user." into sc-v2-dev am: e371b301 am: 3fc6dd50 -s ours am: 5604dfbf -s ours am: 66868803 -s ours am: 5bea0a7b -s ours am: d46112fa -s ours