Merge "Make getSimCallManager msim aware"