Fix sensor triggering issue

Code duplication was causing the wrong sensor to be re-registered,
also, binned brightness isn't a drop-in replacement for proximity
as expected.

Brightness can be low when prox is not covered, the correct behavior
is to verify if brightness is not 0

Test: manual, covering sensor
Test: atest DozeSensorsTest
Fixes: 139298207
Change-Id: I8673e7d9bcb56d7a34741cfad35cf397d976c18d