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 -s ours am: 57ded16f -s ours" into oc-mr1-dev-plus-aosp
am: 4163bebd -s ours
Change-Id: Ica716ddc81c8874dd4ada5f3f386592a120e6592