[automerger skipped] Merge "Fix possible deadlock in incoming call" am:...
[automerger skipped] Merge "Fix possible deadlock in incoming call" am: c203e562 am: ed917bbe -s ours
am skip reason: Change-Id I39f7192c6f79e215ef989797870f5f501197cd08 with SHA-1 fe6da864 is in history
Change-Id: I91adc370d7b614bcd4e28a359aac23fc647a096b