Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into...

diff --cc core/res/res/values/config.xml
Simple merge

diff --cc core/res/res/values/symbols.xml
Simple merge

diff --cc services/core/java/com/android/server/display/AutomaticBrightnessController.java
index 8bfa7d7,265ab00..f757666
--- 1/services/core/java/com/android/server/display/AutomaticBrightnessController.java
--- 2/services/core/java/com/android/server/display/AutomaticBrightnessController.java
+++ b/services/core/java/com/android/server/display/AutomaticBrightnessController.java
@@@ -327,9 -335,14 +336,12 @@@ class AutomaticBrightnessController 
              }
          } else {
              if (mLightSensorEnabled) {
+                 if (DEBUG) {
+                     Slog.d(TAG, "setLightSensorEnabled: sensor disabled");
+                 }
                  mLightSensorEnabled = false;
                  mRecentLightSamples = 0;
 -                if (mInitialLightSensorRate > 0) {
 -                    mCurrentLightSensorRate = mInitialLightSensorRate;
 -                }
 +                mCurrentLightSensorRate = -1;
                  mHandler.removeMessages(MSG_UPDATE_AMBIENT_LUX);
                  mSensorManager.unregisterListener(mLightSensorListener);
              }

diff --cc services/core/java/com/android/server/display/DisplayPowerController.java
Simple merge