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

Change-Id: Icd75afae770c93ac6fdb611e220d8723c07771ac