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

Change-Id: Iebbb74ced2474117f4d7215356316d1423c0de74