Merge "Fix for DeviceOwnerPositiveTestActivityi" into oreo-cts-dev
am: df2054ef66

Change-Id: I865b9e302efb9c4d47e70784ffdb075d5dd4eb6d