Merge "Add new config to tell us whether brightness is bucketed or continuous...
Merge "Add new config to tell us whether brightness is bucketed or continuous am: 65d3e705 -s ours am: dfe9541c -s ours" into oc-mr1-dev-plus-aosp
am: 37fe261c -s ours
Change-Id: I367ae6d462ade35f52d461081b4e958cffc684c9