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

Change-Id: Icea3ffdcb85dca2d00f4fb10ab1fcd84066a02bf