Merge "Merge "Update brightness nits to keep brightnessFloat same when RBC...

Merge "Merge "Update brightness nits to keep brightnessFloat same when RBC toggled" into tm-dev am: 2f8fc626 am: 06305bb5 am: eca2bac4" into tm-qpr-dev-plus-aosp am: 78604bb0

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



Change-Id: I559ec7f2078341b06b0ac812772773c005d517ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>