Merge "Fix flaky tests that use startAndMakeActiveOutgoingCall" into nyc-mr1-dev