Merge "MSIM support for hidden IMS capability and registration query APIs." into oc-mr1-dev-plus-aosp
am: 7c24845ab3  -s ours

Change-Id: I36bfa469842a1dca413b8d5f65eae158e9810ed7