Merge "Add WifiPickerActivity for PICK_WIFI_NETWORK" into honeycomb