Bug 862643 - Ignore proximity sensor event when headphone plugged.
Merge pull request #9701 from alivedise/bugzilla/862646_v1.0.1/psensor

Bug 862643 - Ignore proximity sensor event when headphone plugged. r=timdream, a=blocking-b2g:tef+