[automerger skipped] DO NOT MERGE: Update ConnectivityServiceMock for VPN meteredness bug
am: 3555e5d07d  -s ours

Change-Id: I7a69d1321066cf18ce7b76adeebe7109fe88f093