Allows notification behiavour selection
Lockscreen see through (1/2)

Also add a few missed headers

Conflicts:

	core/java/android/provider/Settings.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java

Change-Id: I8c6660fcc6cb9cc4b320773d595b0dd10901fe37