Merge "Modifies IMS capability APIs to better support MSIM"
am: 5405cc0ee5

Change-Id: I3772f9160203596053f000590502e54d2a5d0f6a