Merge "ConnectivityMetricsLoggerTest am: b1af5e51c5 am: 63dffe336e" into nyc-mr1-dev-plus-aosp