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

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

Change-Id: Ie1bc28917cd5f3a65ca28368dbc6a6f9614a8889