Merge "Re-enable check for VpnTransportInfo session ID." am: 6748f93e56

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

Change-Id: I0de41fe2ba6d2bc691b5693a81da368ae5e0e025