Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev