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

Change-Id: Ifaf73023a932b2866ed3da1d81abeed920e8427b