Merge "NetworkCapabilities: remove duplicated TRANSPORT_NAMES" into oc-dev-plus-aosp
am: c3d2f25a5d

Change-Id: I1e039236d7d4eda6354c81440fbbc43346376f23