Settings: Add proximity wake-up toggle

Change-Id: I2f2449eb324f61b2f7a93acd91b99f144930e66e
Merge remote-tracking branch 'aospa/kitkat' into kitkat

Conflicts:
	res/xml/display_settings.xml

Change-Id: Ia0df6c7a279d37e214bf1f5e5344e53a266eee37