Merge "Allow VcnTransportInfo to be parcelled" am: eecd1d9ca5 am: 3e633b7822

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

Change-Id: Icc63a81c30fb66e433e1a64cf7698b38db71ddb9