tree 2a82b69d160c90632f0a57efd806d1c941b1dbb7
parent 414e304a55d2f65542fdead234cb16f66d270753
parent 24aca4c9dd56cc54858d580b13bb220cbb61e69e
author Frank Li <lifr@google.com> 1617692472 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617692472 +0000

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

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

Change-Id: I736118ea676708ef6630d2153a3986459b31850c