Merge "pppd: fix ip-up-vpn path" am: 6e26ec0129 am: 1906ac8821 am: ee900d223a am: e746383268 am: 9eb1ed3948 am: ced9667b77

Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2627090

Change-Id: I04621e680eee06ec41c443bc291e26893e9d8e66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>