Rewrite label/description conflict detection.

This gets rid of a spurious self-join, and makes label conflict
detection a lot more efficient in general. And it fixes the issue
of mis-reported conflicts.

Bug: 71915
Change-Id: I4a0b9dd5febe641f7bc5910964a158b74b1ef9dd
Merge "Rewrite label/description conflict detection."