Merge "Add session ID to VpnTransportInfo" am: 24aca4c9dd

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

Change-Id: I736118ea676708ef6630d2153a3986459b31850c