Revert "Add active display to AOKP [1/2]"

This reverts commit c5c072c4d4368f58ad8b2803acf61ea7d2869140.

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ActiveDisplayView.java