Merge "Speculative fix for flaky CallAudioRouteStateMachine tests"