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

Change-Id: I5d9166a297b1fdb16d14fcd7eb83866e1be5606a