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
Change-Id: I8326b24d3f6af4993dabd1f3e2bd104b8f7ed36c