Merge "Merge "DO NOT MERGE: Add light sample filtering logic for devices with...
Merge "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" into oc-dev-plus-aosp
am: 28e57e45
Change-Id: I2c22bb3a68408ac79b6943b023df447871ddd308