Merge "Verify the update of shouldLongLivedTcpExcluded in VpnTransportInfo" am: ce1bc54e66 am: a057c9f4e7

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2489116

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