Merge "DPM.createAndManageUser should work even with DISALLOW_ADD_USER set"...
Merge "DPM.createAndManageUser should work even with DISALLOW_ADD_USER set" into nyc-dev am: 09f85680
am: 38d8cd36
* commit '38d8cd36':
DPM.createAndManageUser should work even with DISALLOW_ADD_USER set