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

Change-Id: I1103ff5e3d657b8952019b81f36e10d4a6f8654d