Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev
am: 860f185c66

Change-Id: Ie89e7361d90accde957dc6490dc483c4d4885c0e