* commit 'f654d5b210419e90ba674c73a20a3bcfa9f394e6': Revert "Annotate @SystemApi on some WifiManager methods."