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

Change-Id: I6ca0f9041b3a3b30ee98a00420c08723c8a57be8