Merge "Add a null-check for mScreenBrightnessRampAnimator when dumping"