Merge "Add @SystemApi allowAutojoin(int, boolean) to WifiManager"