Properly check devices for proximity sensor

Change-Id: Id6a011b8a51e0db7369b0bab5d67927aa2899e6d
Merge "Properly check devices for proximity sensor" into kitkat3