DO NOT MERGE: Disable dim brightness reset when using ALS-based doze am: 637ae798cc
am: 0085ce0513  -s ours

Change-Id: Ibded7dd4f59a18ef3268d7c5f19074679392d234