Merge "Use TRANSPORT_USB from the SDK" am: ca688d62d3

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

Change-Id: I7a7d4d6006c5b40e3cb553b8b836a7b93d917065