Add more descriptive UI for conflicts while renaming.

Test: updated existing rename conflict test and ran all
Bug: 31647077
Change-Id: I013bb9348e4691aea42f41f58af83e18e8ca106d
6 files changed