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

Change-Id: Iae8606ffbb046154a890cb43f5ea82a758090ba5