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

Change-Id: I6ca0f9041b3a3b30ee98a00420c08723c8a57be8
tree: 836455f73b5a66bf4a8ccfda756c53edc6378489
  1. core/
  2. services/
  3. tests/