Merge "hotspot2: update PasspointConfiguration APIs" am: 59da9b24ca
am: 4ed5fe8191

Change-Id: I678ec9518c7c88acefd1bb99bcb3add27ca52b87