Don't expand the contact picture behind the call buttons during call.

Doing that avoids stretching more than needed. To avoid a visual 'jump'
of the contact picture when answering the call, animate the contact
picture layout transition.

Change-Id: I6a83281ce594ad2b00aaeb161d5e1c0cb6e4bdef

Conflicts:
	res/layout-land/call_button_fragment.xml
	res/layout-land/incall_screen.xml
	res/layout-land/incall_screen_msim.xml
	res/layout/incall_screen_msim.xml
	src/com/android/incallui/CallButtonFragment.java
	src/com/android/incallui/CallCardFragment.java
Make incoming call screen style configurable. (2/3)

Change-Id: I46db78c9b48fae52530b96789ec2721d51b7185a

Conflicts:
	src/com/android/incallui/InCallActivity.java
	src/com/android/incallui/MSimInCallActivity.java