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