Merge "fixed CdmaSmsAddress parser"
am: b00f00e74b

Change-Id: I041c8f3937882b7fd78adf2c2f2cf87fc225b936