Merge "Cleaned up the flag enforce_telephony_feature_mapping" into main