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

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

Change-Id: I1af4248c14b6bfcf51f0d203712986319b4cfc5e