Merge "Fix BatterySaverScheduleRadioButtonsControllerTest" into main am: f233e50766

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

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