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

Change-Id: Ic962c1de527dd019358611aba731668183e58be1