Merge "Add new config to tell us whether brightness is bucketed or continuous am: 65d3e7059d  -s ours am: dfe9541cec  -s ours" into oc-mr1-dev-plus-aosp