Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b am: 12d74e1e am: 85160f92 Change-Id: I4f112572814976a9ee460c976fe91a54eb4cf098