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

Change-Id: I3220f34afe7e56bcbde87a8de2b00ecddecbc97a