Merge "[automerger skipped] Merge "Add CTS tests for ConnectivityDiagnostics callbacks." into rvc-dev am: ed86e4622d am: 71e1a02040 am: 630bb29431 -s ours" into rvc-qpr-dev-plus-aosp