Merge changes I50b3bd44,Ie538dbc4,Ieeb71ec9 into main

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