Merge "Fix the legacy BatterySaverUtilsTest failed test cases" into udc-dev