Merge "Ensure backlight doesn't change when rbc is toggled" into sc-dev am:...

Merge "Ensure backlight doesn't change when rbc is toggled" into sc-dev am: 5fa180d6 am: fbdb7a3f

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

Change-Id: I8cc6b278df028374f43eb6e520f0a379fe52139f