Merge "Acquire lock before calling getDeviceOwnerAdminLocked" into pi-dev