Merge "Add CTS tests for ConnectivityService" into jb-mr2-dev