Merge "pppd: fix ip-up-vpn path" am: 6e26ec0129 am: 1906ac8821

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

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