Merge "Fix BatterySaverScheduleRadioButtonsControllerTest" into main am: f233e50766 am: 9dd4394163

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3313119

Change-Id: I2b4a26090b9b2f66cd659ea2a5c9812b8b37575d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>