Merge "Add display specific brightness configurations" into sc-v2-dev am: ec29aa26 am: 910c9e55

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

Change-Id: Ie944fed881ea10f66a9170c89012ad4e9436e428