Merge "Fix possible deadlock in incoming call" into rvc-dev am: 3faad57604

Change-Id: Ic77df5e7e46799f289028785d2a797d54dece773