Merge "Update javadocs for ConnectivityDiagnosticsManager." am: 4997b874a3 am: 704eab60eb

Change-Id: Ie1ee81c6050df22b6e3cf9b752e34a1b01430634