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

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

Change-Id: Iec8448cbd997a17dfbb79aac2fa8b3de3231e305