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

Change-Id: Ia393d1ee102ae7dfc4a7b5698b5f3b4882605e7c