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

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

Change-Id: I309fa33ec3ab757d06c02b374bcd7631969c934c