Merge "MSIM support for hidden IMS capability and registration query APIs."
am: b8d25ed3a4

Change-Id: I1636e80c2f09e8949ba44f7225aed16448ed5692