Merge ""allow_add_call_during_video_cal" doesn't work when answer incoming call" am: 412495c61d
am: 1d1024bb1c

Change-Id: I6899f8862377283453a821515edb6794be1c47e2