Merge "passpoint-r2: add updateIdentifier in wifiConfiguration"