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

* changes:
  Revert "Check both isDozing and isAodAvailable for aodVisibility."
  Revert "Always start dismiss transition when the going away anim..."
  Revert "Don't call setLockScreenShown until we know if it's showing."