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
Phone: PT-BR update translations

Change-Id: I029b4caa8c19308a3e49b19d9d4a371e9982fc5a
Add android.permission.INTERCEPT_SMS permission.

Change-Id: I2e357b6a35d8d962eefa903b7de420b556b9f266
Merge "Add android.permission.INTERCEPT_SMS permission." into cm-10.1
Merge branch 'cm-10.1' into martincz
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 branch 'cm-10.1' into martincz
Also show contact name in blacklist.

JIRA:CYAN-1585
Change-Id: I45c0d6bfcb3ab403f191b315a12dfd622f2562bd
Merge branch 'cm-10.1' into martincz