Merge "Check 'number' against both empty and null string for handleCdmaCallWaiting" am: ad7e89a3f2 am: 853f00a952
am: c6c849171b  -s ours

Change-Id: I6ed7883bd0076c2fcc935a2f673049281a3651c7