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