Merge "Revert "AOD: Refactor always on configuration""

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
index 7b2e997,938e76a..4a2ec88
--- 1/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
--- 2/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
@@@ -123,9 -125,9 +125,9 @@@ public class DozeParameters 
      }
  
      public boolean getSensorsWakeUpFully() {
-         return mAmbientDisplayConfiguration.alwaysOnAvailable()
+         return ALWAYS_ON_AVAILABLE
                  && Settings.Secure.getIntForUser(mContext.getContentResolver(),
 -                DOZE_SENSORS_WAKE_UP_FULLY, 0, UserHandle.USER_CURRENT) != 0;
 +                DOZE_SENSORS_WAKE_UP_FULLY, 1, UserHandle.USER_CURRENT) != 0;
      }
  
      private boolean getBoolean(String propName, int resId) {