Merge "fix flaky CTS test PhoneStateListenerTest test" into qt-dev