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

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

Change-Id: Iccf79eb575812caae855581e2ee4918137e8e8b5