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

Change-Id: Ia144dd2e1d4fd43372fecb8fb5ae441b3310a341