Merge "Remove TRANSPORT_USB in NetworkCapabilitiesUtils" am: 55b816cb3f am: 8a470b08b6

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1765531

Change-Id: I396b3f68213f33dbce1d6ac016bb9e308ba03bbd
tree: 4662d7596057334759cc4f560df54467ba94fcc8
  1. staticlibs/