Merge "Fix BatterySaverStateMachineTest." into qt-dev
am: ec9501cb20

Change-Id: Ib57df726f7dc5b310cc858125450da3b65c15159