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 am: 68b53cbb

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

Change-Id: I50e4f3e4dc75b532fc5e5e7e26f9ba7f65b4862c