Merge "Add new config to tell us whether brightness is bucketed or continuous"...
Merge "Add new config to tell us whether brightness is bucketed or continuous" into oc-dr1-dev am: c541380f
am: 619835e5 -s ours
Change-Id: Icad25bad435f64aefdf6ec603bda8ee5b91323ca