Merge "Make ConnectivityMetricsLogger and related classes @SystemApi" into nyc-dev