Merge "Use TRANSPORT_USB from the SDK" am: ca688d62d3 am: 048ef34b88

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1764734

Change-Id: I7ff0480df0d7997ea68422d1fe315fa94c5a0556