DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am: 3275a3a5a5  -s ours
am: d5bf4039a9  -s ours

Change-Id: I4f1a0acabe5d5385af086791b906ff6f45424e59