I searched the codebase for use of the Java SE concurrency primitives blocking methods that can't be interrupted (including blocking queues), and Lock.lock is the only method that may be worth replacing.

We can analyze whether it is likely that a thread is blocked in Lock.lock by a noticeable duration, or, as we did with synchronized, we can mindlessly replace all the calls with Lock.lockInterruptibly and never use Lock.lock again. I prefer the mindless approach in these two cases.