fix build
Revert "Revert "NavTargets : Show highlight for google search""

This reverts commit f2f0bbde136a254067401cf0414dcce65b85dba6.
Revert "Frameworks: Add switch between Active Display and Lockscreen Notification"

This reverts commit b6a4235c30fbf0505c2c70709ee6f76a091e0f1a.
Revert "[1/2] SQUASHED: Omni's Active Display"

This reverts commit 510e82bd2a62c2da6f07b246ba5067e170723d0c.

Conflicts:
	packages/SystemUI/res/values/axxion_dimens.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ClockView.java
AD Redo, NOT DONE YET