Merge "Merge history of packages/Connectivity" into sc-v2-dev-plus-aosp