Merge "Acquire lock before calling getDeviceOwnerAdminLocked" into pi-dev am: b9ab72bf96
am: fc9dd7c67b

Change-Id: I08f626298bd0d58cfa55b3e731e08eb22242e181