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

Change-Id: I8f31a644f74449c0e1812fe4c14cf45be114df0c