Merge "Always give VPN the INTERNET capability." into qt-dev
am: bc16cf3d72

Change-Id: Id91270257bd32e55d9aeb1aefdf1d7f024e4a0ac