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

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

Change-Id: I266c55dad697b0e08af48fd95a060e8fffa6da97