Merge changes from topic "revert-1551943-vpn-impl-FKOLCXTDDT" am: e89170bcb1 am: 23756bef7d

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

Change-Id: I195f88ec1b5ced5ffe6bcef7361f58bd309741ea