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

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

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