Merge "Fix testPartialWakelockDuration flakiness"