Merge "Merge "AOD: Introduce night brightness bucket" into oc-dr1-dev am: 6b978e01 am: 7ce226bd" into oc-mr1-dev-plus-aosp