Merge "Fix flaky tests in RadioOnStateListenerTest."