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

Change-Id: I0bc0326e3ff67fff697f1aea004806978c4244b3