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: 817aa8fd
Change-Id: I198dafd858605309401da487db2d950317e6e2b5