Revert "[1/2] Base: more improve Active Display"

This reverts commit 84116c56e844ea1c0c95374cba27bcf73f62f407.

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