Merge "MSIM support for hidden IMS capability and registration query APIs." am: b8d25ed3a4
am: 5cb9aa55e8  -s ours

Change-Id: I9da5571baf210378fd2f0bbd59f3cca04be849af