Frameworks: Add switch between Active Display and Lockscreen Notification
Credits to @cristianomatos

Conflicts:
	core/java/android/provider/Settings.java
Merge branch 'authorship' of https://github.com/AxxionKat/android_frameworks_base into authorship