[automerger skipped] Merge "Remove getAllVpnInfo from ConnectivityServiceMock." into pi-dev am: abd2e605 -s ours
am: 57c68bac -s ours
am skip reason: change_id If2ea101c1a69097118dff451fb352ed1d709d4fd with SHA1 d8cf12ad is in history
Change-Id: I55d26d7fb7d817d6abf9ba21709e173903d40553