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

Change-Id: I8e51e3e0aa2dfead04316af6d7404a34c7cb0b9b