Merge "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 am: 817aa8fd23" into oc-dev-plus-aosp
am: 28e57e45f8

Change-Id: I2c22bb3a68408ac79b6943b023df447871ddd308