Merge "Merge "Fix BatterySaverStateMachineTest." into qt-dev am: ec9501cb20 am: 9dc60f9eb8" into qt-r1-dev-plus-aosp