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

Change-Id: Ic45aacd750362a47be1b8907a879d283a7aff1e7