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

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

Change-Id: I42b02315fdcc62704d8f92f3bc7bf462dc5b9edf