After pushback from both gun rights and gun control groups, the Trump administration has quietly abandoned its plan to merge the Bureau of Alcohol, Tobacco, Firearms and Explosives into the Drug Enforcement Administration, according to people briefed on the matter.