Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"
am: 4fff94f1ed

Change-Id: I3ce3d2b2af4be23fe9b57b907ef6db280543acbc