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

Change-Id: Ic8fa54bd2058f00c2a78b87a8bdbdcad27f37438