Merge changes from topic "vpn-impl" am: 8be6ba36dc am: e0895f355a am: a44507ec2b am: 89bb3ff718

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1551943

Change-Id: I98dfcb54f02e7d6f0a1b4712b1bb7c635d86baa9