[automerger skipped] Merge "Make getSimCallManager msim aware" am: a8abb52707
am: 0952103ef8 -s ours
am skip reason: change_id I77fecbad6bc8f2c39a755ae0d2d2343d7a0b5db9 with SHA1 132e78b27d is in history

Change-Id: I530581244af2a387a22ede2d820c444db7f21d56