[automerger skipped] Merge "Handle external calls when PhoneSwitcher is not...
[automerger skipped] Merge "Handle external calls when PhoneSwitcher is not initialized yet." am: 063c60bc am: 9824c919 -s ours
am skip reason: Change-Id Ia22dee425f64d4c1162a67e68f673a3e9a180d3d with SHA-1 7134603f is in history
Change-Id: Ia933b4ae909ede7423800899e54f419fa4580d2c