Merge "deviceowner: CreateAndManageUserTest fix data race" into oreo-mr1-cts-dev