Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf

Change-Id: Ib99da397256138cb16ce7873df50996e1fe8be1a