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