Stop overwriting CALL_WAITING with INCOMING

Code too ambitious about setting INCOMING state caused CALL_WAITING
state to be overwritten.
Also fixed unnecessary setting of DISCONNECT.  In both cases the method
updateCallFromConnection() was already setting the states...and in the
call waiting case...a more accurate state.

bug:10396126
Change-Id: Ib0bb7ab2ed87858c441ef0c1bd38820a1c09baa6
2 files changed