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

Change-Id: I14131de322a6ff87369c01372531c30812ec22ed