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

Change-Id: Ib994c656b6cc4f702ccf2d1149b806f51501fb84