Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev am: 860f185c am: 640f04ef am: d6d285ec Change-Id: I6c97db37a23d73fee9e8511d62702e4e0e900a13