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

Change-Id: Id2a11f8821ddce473c6b53ebf1dac7a3667876f2