Merge "Make ConnectivityMetricsLogger and related classes @SystemApi" into nyc-dev am: 74870c4
am: 229e517

* commit '229e5179ba1915b5beb86b0d7989fb356bef9966':
  Make ConnectivityMetricsLogger and related classes @SystemApi

Change-Id: Ia33ecf02187f0c945c0e70d6d939c310cca3c6e1