[automerger skipped] Merge "[DO NOT MERGE] Fix DozeScreenBrightnessTest." into sc-dev am: 82fe00fafe am: 66d3add4fc -s ours am: 5f601165b3 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15994907 Change-Id: I6984c067238d9125ca1b5dc112bccaa8ed0fb297
This commit is contained in: