Merge "Updating CTS code to create user." into oreo-cts-dev
am: c7832c293e

Change-Id: Ided461c053db8708d851b4cfffd52dc2f923a464