Framework: Generic Blacklist support (4 of 5)

Change-Id: Id6c85c9a537713ec77d00deb7f7fe5a9150be2cd

Conflicts:
	core/java/android/provider/Settings.java
Merge "Framework: Fix blacklist support" into cm-10.2
fix merge