Merge "[WifiTrackerLib] Use unique ID instead of FQDN for Passpoint key"