Merge "Allow apps with CREATE_USERS permission to create demo users." into nyc-mr1-dev
am: 65ce524bde

Change-Id: I8c6844cbb109dee8d7b6c72763674c3f4702a288