Lockscreen: Notifications: Fix for devices without proximity sensor

Change-Id: I6b587fb7516c1aac89cc3245793731f8fca6bece

Conflicts:
	res/xml/lockscreen_notifications.xml
	src/com/android/settings/crom/LockscreenNotifications.java
Try to fix settings FC

Change-Id: I5160630032888b30aaba9d820ac3a9e44c5bdc80
Fix another derp in Lockscreen Notifications Settings

Change-Id: If913f2b058dca6396aa3863a93aa2aff68ac4bc6

Conflicts:
	src/com/android/settings/crom/LockscreenNotifications.java