Also show contact name in blacklist.

JIRA:CYAN-1585
Change-Id: I45c0d6bfcb3ab403f191b315a12dfd622f2562bd
Signed-off-by: Arnav Gupta <championswimmer@aokp.co>

Conflicts:
	src/com/android/phone/BlacklistSetting.java

Change-Id: I83c94444515e25774343d73d12618a8039e8534c
Hide additional blacklist separator

When there is no blacklist func enabled we dont need
2 separators at the end of row

Change-Id: Ieef2d2b5f553c2b4dd48ae528e7a0de185f4b2ad
Merge changes Ieef2d2b5,I83c94444 into jb-mr2

* changes:
  Hide additional blacklist separator
  Also show contact name in blacklist.