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

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

Change-Id: Ia3506b712a87026b8135ca15725ae2d3514e57f8