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

Change-Id: I4f63ebc686691b810538508e0959659bf2f8ae46