Merge "Use connectivity APIs from framework-connectivity" into sc-dev