Merge "Remove MessageUtils usage in VpnTransportInfo" am: 0255ab4694 am: 16e6253643 am: bdaef78b90

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

Change-Id: Ibf1592220cedb387d8edba27a7bbe49a36f42dc0