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