Merge "DO NOT MERGE: Add light sample filtering logic for devices with ambient...
Merge "DO NOT MERGE: Add light sample filtering logic for devices with ambient light sensors that can be regularly obstructed. am: 5b825096 am: cc1435b7 -s ours" into oc-dev am: 989657bd
am: 2dc5e0f3
Change-Id: I75d94e322c16d947c2439ce2975444f13cdeb4d7