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