Let InCallUI handle proximity sensor for incoming calls [2/2]

Change-Id: I939a70ac09a8868e128a7ecc982a570993cb86c7

Dialer: Fix proximity on wake handling

*) http://review.cyanogenmod.org/#/c/167122/ introduced an issue
   where the screen would never turn off during a call if the system
   proximity on wake setting was turned off.

*) Fix this by making sure the proximity_on_wake setting is only
   used when we have an incoming call.

Change-Id: I49f8759112c4f9bfe41325dd3329eb2d1902231f