Fix Gapps startupwizard FC

Signed-off-by: hany <hany.alsamman@gmail.com>

Change-Id: I6f6aeb79b0e21f9f369ca5dfbf87b6205900e204

Conflicts:
	cmds/svc/src/com/android/commands/svc/WifiCommand.java
	services/java/com/android/server/wifi/WifiService.java
	wifi/java/android/net/wifi/IWifiManager.aidl
	wifi/java/android/net/wifi/WifiManager.java