[automerger skipped] Merge "Move VPN JNI to the bottom of srcs" am: 64512597 am: 2442a584 am: d60841c6 am: 5352582f -s ours am: dae90d76 -s ours

am skip reason: Change-Id I3ab497f2133c9020131ca4392f34aedb8da99cc9 with SHA-1 3fcb538e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479481

Change-Id: I78c94caf2356ba4172f8f528cdb80c1548fa114a