Merge "Merge "Stop RBC affecting brightness so drastically" into sc-qpr1-dev...

Merge "Merge "Stop RBC affecting brightness so drastically" into sc-qpr1-dev am: 6be9887c am: 7ecf186f" into sc-v2-dev-plus-aosp am: 101f323b

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

Change-Id: I971ff4f6f071319b1039e83d4d1b58cbe03851c5