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: c1e105bb am: 7e47a4b8

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

Change-Id: Id5186de575d583ef9f6adc942cb8cb416d56e51b