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