Merge "Settings: Add laser sensor preference" into oc-mr1-dev am: 22eb007eea
am: 11179290a2

Change-Id: I0575553117ca62c027a82aa69ecc0c1865f6c762