[automerger skipped] Merge "Add CTS tests for ConnectivityDiagnostics callbacks." into rvc-dev am: ed86e4622d -s ours am: 97ef6954a4 -s ours am: 53fc8b08d9 -s ours am: 222aec4928 -s ours

am skip reason: Change-Id I748229d41c16adf1561e03aa597d5aac00f12912 with SHA-1 caf797ef34 is in history

Change-Id: Ie3f6a30f6519becd7559142899dacebb03bb5687