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

Change-Id: I04d457733c11b18435fe45670d25bb544592a550