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

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