Merge changes Ie45f0083,Ib56c506d into main

* changes:
  [SB][Flexi] Add status bar to lockscreen in flexiglass.
  [SB][Flexi] Add MIGRATE_KEYGUARD_STATUS_BAR_VIEW flag.