Merge remote-tracking branch 'origin/LNX.LA.3.5.2.2.1_rb1' into kk4.4

Conflicts:
	Android.mk
	AndroidManifest.xml
	res/values/array.xml
	res/values/dimens.xml
	res/values/strings.xml
	src/com/android/incallui/CallButtonFragment.java
	src/com/android/incallui/CallButtonPresenter.java
	src/com/android/incallui/CallCardFragment.java
	src/com/android/incallui/CallCardPresenter.java
	src/com/android/incallui/CallCommandClient.java
	src/com/android/incallui/CallHandlerService.java
	src/com/android/incallui/CallList.java
	src/com/android/incallui/CallUtils.java
	src/com/android/incallui/CameraHandler.java
	src/com/android/incallui/ImsCamera.java
	src/com/android/incallui/InCallActivity.java
	src/com/android/incallui/InCallApp.java
	src/com/android/incallui/InCallPresenter.java
	src/com/android/incallui/MediaHandler.java
	src/com/android/incallui/VideoCallManager.java
	src/com/android/incallui/VideoCallPanel.java
	videophone_ims_camera_jni/videophone_camera_impl.h
	videophone_ims_camera_jni/videophone_ims_camera_jni.cpp

Change-Id: If127a18b020b1a01739c76c0430ea3578178f1bf
MSIM(DSDA): Do not dismiss answer call UI when call active

Do not dismiss answer call UI if device has
INCOMING call on any subscription.

Change-Id: Ib3fa43779663ae77705f7ee2329166d1bff3e2b5
CRs-Fixed: 649470
Underp the dialpad buttons

 * Fix weirdo button that joined us with a bad merge

Change-Id: Id54a5883d0fca789f8f53a851363d6eda2aae6af
incallui: fix callbuttons xxhdpi images

Fix addParticipant and modifyCall images to properly fit in xxhdpi resolutions

Change-Id: I9f1ff0517a86a25660295f1302d0d20e2482fd12
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Replace deprecated string resources.

alert_yes/no were deprecated in 4.4, and discontinued in 4.4.3.
Replace them with the system's "yes/no"

Change-Id: Ia0b2a68ffb7098c3c4ba70856e831a61161e2886