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

Change-Id: I7d05118b601144c5faf5e04a2c73f62c91dd42e1