Merge "Modifies IMS capability APIs to better support MSIM" am: 5405cc0ee5
am: 1918c7ca83  -s ours

Change-Id: I4380746b4a38538b658979eb82cbf2084348a028