Merge "Add session ID to VpnTransportInfo" am: 4ae4410678

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

Change-Id: I736118ea676708ef6630d2153a3986459b31850c
tree: 589b4beb0e5f345437e210684ba4b01a76f35836
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING