Merge "Disable FaceAuthScreenBrightnessController"