Merge "Add system feature flag FEATURE_WIFI_PASSPOINT"