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

[automerger skipped] Merge "[DO NOT MERGE] Fix DozeScreenBrightnessTest." into sc-dev am: 82fe00fa am: 60763f66 am: d0665689 -s ours am: b410d844 -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