Merge changes from topic "revert-27773289-revert-27770576-DGMSFQBZGQ-BXQDHOGVAC" into main

* changes:
  Revert "Revert "Don't call setLockScreenShown until we know if i..."
  Revert "Revert "Always start dismiss transition when the going a..."
  Revert "Revert "Check both isDozing and isAodAvailable for aodVi..."