Merge "Handle CallStateException in PhoneInterfaceManager." into oc-dev am: 75b8632a41
am: 82f805ba71  -s ours

Change-Id: Ifce7176b1d81c0534578f12564d6a450959c1f4f