Merge "[AWARE] Move WifiAwareNetworkSpecifier Builder to its parent class"