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: I00e51d4f8de97c7b67aef028e9ee358678e82379
tree: ab975c76b28864de6e35eb8866da00452ec662a3
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING