Merge "Update the transport types of metrics" am: 70be96ffbf

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

Change-Id: I041ead53badcad1480b7c5cd42f5fbd188440bbc