am f1c6dd08: (-s ours) am 6f2af6a2: Merge "Always create CdmaPhoneCallState object in PhoneGlobals." into mnc-dev

* commit 'f1c6dd08d351749fb78646ff3b49b99bf72bf4dd':