Merge "Handle CallStateException in PhoneInterfaceManager." into oc-dev
am: 75b8632a41

Change-Id: Ifdf4786f8bc591fa61389b969c893818a03be2b5