Merge "[CTS] cherry-pick the fixes for CONNECTING state" into android13-tests-dev