[automerger skipped] Merge "Always give VPN the INTERNET capability." into...
[automerger skipped] Merge "Always give VPN the INTERNET capability." into qt-dev am: bc16cf3d am: 053f8b30 -s ours
am: 09aee701 -s ours
am skip reason: change_id I262ca41fe0225660551c9a421562405366b6acac with SHA1 06d81d2c is in history
Change-Id: I8c7be91223f840cca4a252b091c65ef4a34db144