Merge "Add APIs for configuring VPN automatic keepalive and IP versions" am: 1d2bead412 am: 8cc44c455e

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

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