Don't crash when making calls. That's bad mm'kaayyy?

Change-Id: I7bb1b8ce2b6a500c76798a54851ef8d27390de5b

Conflicts:

	src/com/android/incallui/MediaHandler.java
	src/com/android/incallui/VideoCallManager.java