Merge "Clear DISALLOW_ADD_USER user restriction when dpm remove-active-admin is called from shell"