Merge "Adding flag com.android.systemui.keyguard_transition_force_finish_on_screen_off to trunk_staging." into main