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: 42d3b471

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

Change-Id: Ide2431ce4b2d9d4d62cc60eb4ad1f10d1282fff7