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

Change-Id: I74d977c9835bedc922966916a5c85fc6afb8c9e8