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

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

Change-Id: Ie7ff1430f7e31329b5a4acadb37bb9c11049fbea