Merge "AOD: Introduce night brightness bucket" into oc-dr1-dev