Merge "Fix BatterySaverScheduleRadioButtonsControllerTest" into main