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

Change-Id: I3e204d5f1abbd5f3d100a187d0e7cf96e81b07f1