Merge "add TRANSPORT_THREAD to NetworkCapabilities"