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

[automerger skipped] Merge "[DO NOT MERGE] Fix DozeScreenBrightnessTest." into sc-qpr1-dev am: faef08cf am: 15bbc6bb -s ours am: 8ce09004 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6f8b68a2d0faa54442cee3d726917afa939cbcf5