[automerger skipped] Merge "[DO NOT MERGE] Fix DozeScreenBrightnessTest." into...

[automerger skipped] Merge "[DO NOT MERGE] Fix DozeScreenBrightnessTest." into sc-dev am: 82fe00fa am: 66d3add4 -s ours am: 5f601165 -s ours am: 585b9bc8 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15994907

Change-Id: I3d8f3bb4e70f7b3494607ceb86ecc70dea04dc7e