Merge "Merge "AOD: Introduce night brightness bucket" into oc-dr1-dev am: 6b978e0106 am: 7ce226bd6c" into oc-mr1-dev-plus-aosp
am: a3c448d37a

Change-Id: I944335265773819b2a44e9d0db7529f6f489c55a