[automerger skipped] Merge "test: ConnectivityService: Validate Route Add/Del" into rvc-dev am: 50fa7818c1 am: c439fa8a15 am: 2ac3cf71c3 am: 7289f1b384 -s ours
am skip reason: Change-Id I18296b933e856a0f8a4c1dbd75bd35024853bfbb with SHA-1 d9375e4a5e is in history

Change-Id: Ie83551bd711bee8f4e2b0c8230633c06eb145456