Fix blacklist preferences fragment transition for tablets.

Change-Id: Iecde099b111ae31c8e11ce366d9d06d965029ed7
Fix reference to privacy settings

Change-Id: I4d0c4f957778ad814b9d2ac816cff96bcba0e216
Merge "Fix blacklist preferences fragment transition for tablets." into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0