Merge "Merge "Add new config to tell us whether brightness is bucketed or continuous" into oc-dr1-dev am: c541380f91  -s ours am: 57ded16f03  -s ours" into oc-mr1-dev-plus-aosp