[automerger skipped] Merge "Add session ID to VpnTransportInfo" am: 133733bdd2 am: dc50757d4d am: 537e4415b1 -s ours

am skip reason: skip tag Change-Id I8d09e25b83f7ee8be21ec9c9bd3c72a251f1370d with SHA-1 5acb6b6d4e is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652218

Change-Id: Idcdd09ad0e7c11482dc048dd30f4a72a7e294b2f
tree: 393e95a78c044dc6512bd4f727c3d5e06100b0e5
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING