Merge "Remove KeySetManagerService lock."