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

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

Change-Id: Ib0dfb9ca4f7e6fc9163d7cc978cd322f03516638