Merge "Check 'number' against both empty and null string for handleCdmaCallWaiting" into oc-dr1-dev am: 13287dfeb8
am: 793d2812c6

Change-Id: I23633e8f92094befc58c18c4903e1d8ab006dd6c