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

[automerger skipped] Merge "[DO NOT MERGE] Fix DozeScreenBrightnessTest." into sc-dev am: 82fe00fa am: 66d3add4 am: af9f3fa2 -s ours am: 2b53210f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9b09fc08aeee241b5979c1439c426d15a6804915