Merge "WifiAwareManager: Mark NetworkSpecifierBuilder class final"