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