Merge "DO NOT MERGE: Cap doze autobrightness when collecting new sensor...
Merge "DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples" into cw-f-dev am: e2590ccc
am: 8c288cd7 -s ours
Change-Id: Ic3d810fc1b13a0d896b7600329d2b925a5d76150