Merge "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze" into cw-f-dev
am: a39e64eac2

Change-Id: I76a3334bd1464d9d8591f4bf1bbe369d90753d5e