Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev
tree: 660382ac96be1cd1679f177884b4be722b731678
  1. framework/