Merge "Fix dead lock between AM and BatterySaverStateMachine" into pi-dev