Merge "Adjust float-to-int brightness conversion to be purely in float." into rvc-dev am: 28e8a2c0ca am: 5c46e05058 am: 9938975072

Change-Id: Ia5ab0b819e4934e712ea1164dd38c9ec795b57ba