AD: revert some merges
Active display: Fix visible NavBar buttons on LockScreen

[log]

Change-Id: I05ffaa073fadd8efb74affae793867c9f741aff0
Active display: Next try to fix "turn off display if device gets pocketed again"

Change-Id: Ice9354faf4a939f31a5bd590031ee001a62712fb
Revert "Active display: Make GlowPadView center the current notification icon for us"

This reverts commit 3100c626d43c0d2939af9c2dcab13ac1980c24ae.

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ActiveDisplayView.java
Active display: Use a default notificaiton icon

In case there is an exception when trying to load the
notification icon we will use a default one.

Change-Id: I4087ef3e407cf976f7bfb2bb89f850641101bc73