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

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

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