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

Change-Id: Iaae7763a4d744ad8a63538750c5ed3efe38161d5