Merge "ImsSsData needs a public constructor for vendors to use" am: a1474266bf
am: 207b9dcfbf

Change-Id: Ia47462edc30809ca90f2955eeef87b0d4ba32a80