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

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

Change-Id: I341aa801fad192d2338ed29579ea4ecabd0107b9