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