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

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

Change-Id: I20430230c5cd25e0099ae8a9ade1700a74fe93ca