Merge "Cleanup flag add_anomaly_when_notify_config_changed_with_invalid_phone" into main