Merge "Check 'number' against both empty and null string for handleCdmaCallWaiting"
am: ad7e89a3f2

Change-Id: Ib8115750b3281cfb3f0250ab22d3d0328d1fe617