Merge "VPN: Move package intent receiver to ConnectivityService." am: aff267369c
am: dc6049f079

Change-Id: Ib9213aa8875d124b08e7e13982db663711de43b5