Merge changes Ia7cc37cf,I78237002 into main

* changes:
  [flexiglass] Immediately locks device when sleep button is pressed.
  [flexiglass] Adds support for "lock now" from KeyguardService