Merge "Modifies IMS capability APIs to better support MSIM" into oc-mr1-dev-plus-aosp
am: 9b9065b0f3  -s ours

Change-Id: I2a432f189c07e1b861bac9dfd1d67ad81f48ce84