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

Change-Id: Icdb0a74c9b11aad86b20250dd67e74627a95dbf5