Merge "[WifiTrackerLib] Add null check to setOsuWifiEntry()" into rvc-qpr-dev