Make contacts app aware of blacklist setting (2/3)

Also fix up notify option key while we're at changing the user's
settings ;-)

Change-Id: I51069235693ee9fd055d11e62f8f152ff7bc0210
Store phone blacklist in content provider (4/4)

Change-Id: Id5f35132e66e74215158929fae0fe0276e7ba010
Merge "Make contacts app aware of blacklist setting (2/3)" into cm-10.1
Merge "Store phone blacklist in content provider (4/4)" into cm-10.1
merge changes from remotes/github/cm-10.1 into master
Also show contact name in blacklist.

JIRA:CYAN-1585
Change-Id: I45c0d6bfcb3ab403f191b315a12dfd622f2562bd
merge changes from remotes/github/cm-10.1 into master