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

* commit '74870c441fde0aa141edca84f066d1ace4cf5db5':
  Make ConnectivityMetricsLogger and related classes @SystemApi

Change-Id: Id302c045286578163c40eb02108d675c6031afc5