Merge "Update longLivedTcpConnectionsExpensive value in VpnTransportInfo" am: dd52778afb am: 307dabd936 am: 36357eddcb

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

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