Merge "Add session ID to VpnTransportInfo" am: 133733bdd2 am: dc50757d4d

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

Change-Id: I554a86b2445f0449e5556871f553158dff19e192
tree: ce45b9b62685cf3c636b1720887cbf153c5892bb
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING