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

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

Change-Id: I167c4c4608c3f26aeb02a1c89d7b873bb0d074a4