Modifies IMS capability APIs to better support MSIM
am: e7bf9beaa9  -s ours

Change-Id: I200fec2d37e03c4c36667d56af8db446ae45657e