Merge "Merge "MSIM support for hidden IMS capability and registration query APIs." am: b8d25ed3 am: 5cb9aa55 -s ours am: f63b3dcb -s ours"