Merge "DO NOT MERGE: Add light sample filtering logic for devices with ambient light sensors that can be regularly obstructed. am: 5b8250964b am: cc1435b7f3  -s ours" into oc-dev