Merge "Fix copyright license of VpnTransportInfo" am: 594e8def4c am: 9044d1e472

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1172acbf1f7cb693dd06db368fe5fe70dcc11858