Merge "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"...
Merge "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze" into cw-f-dev am: a39e64ea
am: 38405b69 -s ours
Change-Id: I85c746508e10e7b7b739587b7d9fce081d53ecca