Merge "wifi: hotspot2: Passpoint configuration APIs update" am: b1c9bc5ea5 am: fdbc827a52
am: 5549acb0e6

Change-Id: I202a51c7d32ecf747fcc32597ac574b5faac2037