Merge "Only call getActiveAdminForCallerLocked when holding a lock"