Merge "Add session ID to VpnTransportInfo" am: 320cd17220 am: 45d9b25a36

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

Change-Id: I42628292a9d30ac39e29278214b9a179f28e277c
tree: 87f2286656d9b8020ed0eb2febad7cea2a6e2201
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING