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