Merge "Add new bucket above high brightness for "sunlight"." into oc-dr1-dev
am: 5898d52184

Change-Id: I5bc6a34975e5b044122998a05ab573a9ed431ecd