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