Merge changes from topic 'aod-mr1' into oc-mr1-dev

    <!-- Whether the display blanks itself when transitioning from a doze to a non-doze state -->

    <bool name="config_displayBlanksAfterDoze">false</bool>

    <!-- True if the display hardware only has brightness buckets rather than a full range of

         backlight values -->

    <bool name="config_displayBrightnessBucketsInDoze">false</bool>

    <!-- Power Management: Specifies whether to decouple the auto-suspend state of the

         device from the display on/off state.

  <java-symbol type="integer" name="config_inCallNotificationVolumeRelative" />

  <java-symbol type="bool" name="config_dozeAlwaysOnDisplayAvailable" />

  <java-symbol type="bool" name="config_displayBlanksAfterDoze" />

  <java-symbol type="bool" name="config_displayBrightnessBucketsInDoze" />

  <java-symbol type="integer" name="config_storageManagerDaystoRetainDefault" />

  <java-symbol type="string" name="config_headlineFontFamily" />

  <java-symbol type="string" name="config_headlineFontFamilyLight" />

    // blank itself and begin an appropriate power on animation.

    private boolean mDisplayBlanksAfterDozeConfig;

    // True if there are only buckets of brightness values when the display is in the doze state,

    // rather than a full range of values. If this is true, then we'll avoid animating the screen

    // brightness since it'd likely be multiple jarring brightness transitions instead of just one

    // to reach the final state.

    private boolean mBrightnessBucketsInDozeConfig;

    // The pending power request.

    // Initially null until the first call to requestPowerState.

    // Guarded by mLock.

        mDisplayBlanksAfterDozeConfig = resources.getBoolean(

                com.android.internal.R.bool.config_displayBlanksAfterDoze);

        mBrightnessBucketsInDozeConfig = resources.getBoolean(

                com.android.internal.R.bool.config_displayBrightnessBucketsInDoze);

        if (!DEBUG_PRETEND_PROXIMITY_SENSOR_ABSENT) {

            mProximitySensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY);

            if (mProximitySensor != null) {

            boolean wasOrWillBeInVr = (state == Display.STATE_VR || oldState == Display.STATE_VR);

            if ((state == Display.STATE_ON

                    && mSkipRampState == RAMP_STATE_SKIP_NONE

                    || state == Display.STATE_DOZE)

                    || state == Display.STATE_DOZE && !mBrightnessBucketsInDozeConfig)

                    && !wasOrWillBeInVr) {

                animateScreenBrightness(brightness,

                        slowChange ? mBrightnessRampRateSlow : mBrightnessRampRateFast);