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

Change-Id: I990aff4628736eb733b8fca80a1cbc7c2424363a