Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev