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

Change-Id: Icb644b09789e9786610462cce0ce902bd9d40d01