Merge "Migrate ip-up-vpn to Soong" am: c7f873566a am: 16257f6e7d am: 9a8543c84f am: cc13b14f0c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1882448

Change-Id: I28f4ad7978ba6e248bfe7ae34831db21df7c0dbe