Merge "Mock BatterySaverStateMachine in PowerManagerServiceTests" into rvc-dev am: 8dd9111809 am: 91e76bf9f6

Change-Id: I73d2c8f152bf04135bd8c0c1057eae62b341282c