Merge changes I105589aa,I3674fd5b,I215962fa,I5ca97e26,Ib47a1a6d

* changes:
  p2p: add valid string documentation for network name and passphrase
  p2p: rename the annotation to match the API names.
  p2p: add annotation for WifiP2pConfig.Builder public API
  p2p: add annotation for WifiP2pConfig.Builder public API
  p2p: add annotation for WifiP2pConfig.Builder public API