Merge "DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples" into cw-f-dev
am: e2590cccfd

Change-Id: I887432053d2503cf542ad3106ab915a0d4f3998f