Merge "[DO NOT MERGE] Fix DozeScreenBrightnessTest." into sc-dev