Merge "Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev am: 860f185c am: ed005b29" into oc-mr1-dev-plus-aosp