Merge "Remove MessageUtils usage in VpnTransportInfo" am: 0255ab4694

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

Change-Id: If3c85705ecc0d27b9d365b302378329637474a80