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

Change-Id: I3bcf4dfc80dfae4d467b925faa9eaba53e5977f4