Wifi Display (5/8)

Conflicts:
	services/java/com/android/server/display/WifiDisplayController.java