[automerger skipped] Merge "Add session ID to VpnTransportInfo" am: 320cd17220 am: 45d9b25a36 am: 1502d841cf -s ours

am skip reason: skip tag Change-Id I883035262465238c35c5a931d89707f3e84feef8 with SHA-1 ac6614fa05 is already in history

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

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