[automerger skipped] Merge "[DO NOT MERGE] Fix DozeScreenBrightnessTest." into sc-qpr1-dev am: faef08cff7 -s ours am: 17a4c5e0d9 -s ours am: f5504c51c0 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16047064 Change-Id: I8068abaf450c5f0982b4a2653e022bc4b74f2054
This commit is contained in: