Merge "Merge "Fix ScreenOffBrightnessControllerTest" into udc-dev am:...

Merge "Merge "Fix ScreenOffBrightnessControllerTest" into udc-dev am: 819dfe9d am: 5a81f2fe am: 1e005849" into udc-qpr-dev-plus-aosp am: b7eef285

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



Change-Id: I628963471801e5a62c16929a62cd24ea7f15ab36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>