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

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

Change-Id: I554a86b2445f0449e5556871f553158dff19e192