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
Fix derp.

Adjust MSim activity for http://review.cyanogenmod.org/#/c/68196/

Change-Id: I9fbe78aa3813a7cfd90e750712c26d26e6224f64
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_InCallUI into cm-11.0