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

Change-Id: Iaa0c34057f22b5a7a24b86c595b4472b0503ad72