[automerger skipped] Merge "Add new ProximitySensor wrapper that automatically uses appropriate sensor." into qt-qpr1-dev am: a9667ff3ab
am: c507eb7ae2 -s ours
am skip reason: change_id Id151ce8f702f7deadab73ee3904a0a883870b237 with SHA1 84fa27056b is in history

Change-Id: I625ee6f34f8958294e8cccaa6a8a4992495c88ef