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

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

Change-Id: I46690d8e0f9e3a6695726c73e727a2b0bc012c68