[automerger skipped] Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev am: 91af7c65f0 -s ours

am skip reason: Change-Id Ie302b1f4f437e819fdd15ec28adb0b56750c2c53 with SHA-1 68307bf301 is in history

Change-Id: I2e8071232c2a866f1c6540cb2d43988d30a4ee65