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

Change-Id: I3997b5b44328f34ef91f07a3207cf9c8d601f4d6