Merge "Updates to brightness mirror to play with color extraction" into oc-dr1-dev
am: 4cccea6b6a

Change-Id: I821c127ed06ecd858e6380ddc4019fcc17d7fc32