When DPM is updated while lock screen is inhibited, don't
unconditionally enable lock screen.

Change-Id: Iab2af06eb8e41fbcfc6adfbeb5b42a9bbf446fe9
Make contacts app aware of blacklist being disabled (1/3)

Change-Id: Ic59f370a6e78390c9b2b1510e0ec85b2f4af9146

Conflicts:
	core/java/android/provider/Settings.java