Merge "Merge "wifi: add a flag indicating legacy Passpoint configuration" am: 2d87679a11 am: 1228b6cdec" into nyc-mr2-dev-plus-aosp
am: 01213393fb

Change-Id: Ic5ea3f8c8521e818ee771b20cdb4d43875d6daa7