Merge "DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices" into froyo