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

Change-Id: I1bdb56e5d7dde91ced6aaba3717ce53407f19b18