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

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

Change-Id: If5ab413d6cea71a3dcc98634d7ad8a11fbd2bbd1
tree: 03a4a8536039bd5a1d60e33b06ced65d2a7b2269
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING