Merge "Merge "Add empty CdmaSmsSubaddress to CDMA PDU parsing" am: 78a7b5d44a am: 4e1563e512" into pi-dev-plus-aosp
am: 48978dd213

Change-Id: Ifc64e5d785a62d61cd8c176a7a3553390956a796