[automerger skipped] Merge "test: ConnectivityService: Validate Route Add/Del" into rvc-dev am: 50fa7818 am: c439fa8a -s ours
am skip reason: Change-Id I18296b933e856a0f8a4c1dbd75bd35024853bfbb with SHA-1 d9375e4a is in history
Change-Id: Ic817a427e91db94dd97f8310643dc30bd962cf22