Merge "Revert "NetworkCapabilities: Embed location senstive TransportInfo""