Merge "Fix for DeviceOwnerPositiveTestActivityi" into oreo-cts-dev