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

Change-Id: I82350ac6ce99890d30542b7616dac8579eed0413