Merge changes Ib9871a4e,Ife687d6f into main

* changes:
  [flexiglass] Shortcuts beside UDFPS blueprint.
  [flexiglass] Compose version of KeyguardRootView.