Merge "Remove dependency on ShadeExpansionStateManager from KeyguardBypassController" into main