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

Change-Id: I4093d3802b9f17f105430437ea081ee51d35f6fb