Merge "Cleanup unused WifiP2pSettings code in WifiSettings"