[automerger skipped] Merge "Always give VPN the INTERNET capability." into qt-dev
am: bc16cf3d72 -s ours
am skip reason: change_id I262ca41fe0225660551c9a421562405366b6acac with SHA1 318feaf1ed is in history
Change-Id: I367d5afaa5ee254064d61f7f807af838b37583fe
This commit is contained in: