Merge "Auto adjust screen brightness when display state on while docked" into...

Merge "Auto adjust screen brightness when display state on while docked" into sc-qpr1-dev am: b8769ea4

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

Change-Id: If4629326c364a4458340df769d0d5c118b300593