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

Change-Id: I71342f839fe9f8e6ebc9b130c5246ca22ff336d3