Merge "Fix possible deadlock in incoming call" into rvc-dev am: 3faad576 am: 366e4bd5 am: 13c494b0 Change-Id: I5d35272792fa4012e1740515907414b92b5e5f72