Merge changes from topic "vpn-impl" am: 8be6ba36dc am: 2388b5a061

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

Change-Id: Ib3225198f79a96bc0c4bdfb61c18da23570fde50