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 am: 66d169e4

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

Change-Id: I80f1aa3851d58f7557477c6de2d061f89b6b5abb