Merge "[WifiTrackerLib] Add Passpoint R2 remediation string" into rvc-dev