Merge "Fix request thread is blocked due to call API answerRingCall"
am: 1dff3bdc50

Change-Id: Ide2ef0c04f7cf2b7f43bbdaecd38d92aa6353dd6