Merge "Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based...
Merge "Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"" into cw-f-dev am: e88cbbf4
am: af9361f5 -s ours
Change-Id: I06dca83d8bee11d0f8ad64770f7bff2e78ff40a9