Merge "Stop RBC affecting brightness so drastically" into sc-qpr1-dev am: 6be9887cb9 am: fd34e696b9

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

Change-Id: I3584602a16efda1e042c0db1b884884035b6f02a