Merge "Make getSimCallManager msim aware"
am: a8abb52707

Change-Id: I95afc03ddb2c58ea96092fff6e642809b5fc7eaa