Merge "wifi: update callsite for Passpoint configuration management APIs" am: c77019853f
am: 4f8b0abd52

Change-Id: I6e9a74fdd711a8c2bafe6730cb52e2a153155ede