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