Merge "Allow apps with CREATE_USERS permission to create demo users." into nyc-mr1-dev am: 65ce524b am: 26fa6328 Change-Id: I801d3d3cd6d6781d12d8cc692991918d968cab3e