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

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

Change-Id: I0e4deaccf95ea9422654e85a3fa4df9d6752455e
tree: 81f3f24b933083869658cb71e22248638646148d
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING