Merge "Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b am: 85ab8086" into rvc-d1-dev-plus-aosp