Merge changes I0afdda02,I1c47f616 into main

* changes:
  Implement ConnectivityStateMetrics sample
  Add base classes for common ConnectivityService tests.