Merge "Fix theme of BrightnessDialog" into udc-qpr-dev am: 4867d4e1 am: f8beac53

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



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