Merge "Verify the update of shouldLongLivedTcpExcluded in VpnTransportInfo" am: ce1bc54e66 am: 3905c6698c am: f792e5343f

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

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