Merge "Fix ScreenOffBrightnessControllerTest" into udc-dev am: 819dfe9d am: 5a81f2fe

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



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