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

Change-Id: I657979059af811851920a7f38430b267951dab4d