Merge "Speculative fix for flaky CallAudioRouteStateMachine tests"
am: 3a0d757192

Change-Id: I1d0cf71d06462c1e0a6a3db7164e300249eabbda