[automerger skipped] Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf am: 6b21fc4608 -s ours

am skip reason: Change-Id Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8 with SHA-1 75f688be48 is in history

Change-Id: Icc020d872394b2bce4983b55a9fae96cff919c98
tree: 992ce52efddf2466d0dfbc80468d382a179c5579
  1. core/
  2. services/
  3. tests/