Merge "Update ImsSsData/ImsSsInfo API based on API council feedback." am: cef848b56e
am: 391d3b7d44

Change-Id: Iaf0bda0abb91426697630a1b506f381bc77ed6b5