Merge "wifi: WifiManager API change for supporting Passpoint Release 2" am: 8150581742
am: 358fe50e4d

Change-Id: Idc004300acfc3db7036ea31466fe392454fd144c