Fix LN/Active Display "Bug"

Active Display and Lockscreen Notifications were never meant to run at the same time but for some reason, users keep on trying to do it anyways.

Is been reported left and right over at XDA and as well as Jira http://jira.dirtyunicorns.com/browse/DU-10

This patch should fix that "bug", making it only able to use 1 while disabling the other.

Credit/Thanks to LiquidSmooth

Change-Id: If401f0f46ccfedfd42f5c4c45a45a8f9ef9321b2

Conflicts:

	src/com/android/settings/mahdi/ActiveDisplaySettings.java
	src/com/android/settings/mahdi/lsn/LockscreenNotifications.java
Revert "App Circle Sidebar: Support for Configurable Trigger Region[2/2]"

This reverts commit 2a3c8a0cbbf32fb27f1cd80e9f5cdbef8bed53a8.