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

Change-Id: Ic38d249c68646a4ae4c4d34d0f4a612f75d5bbbd