Merge "MSIM support for hidden IMS capability and registration query APIs." into oc-mr1-dev-plus-aosp