Do not unify locks when Work lock is set to None

Bug: 26845805, 26892601
Change-Id: Ie78ef417a59b29246d4d3dde5dfe434ad49b195c
1 file changed