[automerger skipped] [DO NOT MERGE] Fix DozeScreenBrightnessTest. am: 20d85a91d4 am: cb17c9d93c am: 4d05e6311e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6c4627968465859a46b57f882a98de7b4ae0a3da