Merge "Add new ProximitySensor wrapper that automatically uses appropriate sensor." into qt-qpr1-dev
am: a9667ff3ab

Change-Id: Idc3b5781ff6fc84086a9094bce64958c0985bad9