Merge "DO NOT MERGE: Add dynamic illuminance hysteresis support" into cw-f-dev am: 529beb2cc5
am: bbf98790f4  -s ours

Change-Id: I4b8beb6054004ba502b5a0d140ed00d06b31c654