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