Merge "[automerger skipped] Merge "Always give VPN the INTERNET capability."...
Merge "[automerger skipped] Merge "Always give VPN the INTERNET capability." into qt-dev am: bc16cf3d -s ours am: b0307ddd -s ours am skip reason: change_id I262ca41fe0225660551c9a421562405366b6acac with SHA1 06d81d2c is in history" into qt-r1-dev-plus-aosp