Merge "Add CTS tests for ConnectivityDiagnostics callbacks." am: 21763671f4 am: 55a841b153 am: cd696b1075

Change-Id: Iaf22131886918c1b1baecf8f655cf7892cd3c509