Merge "Fix for CtsTelephonyTestCases.testConferenceCall" into android13-tests-dev