[automerger skipped] Merge "Fix deadlock in cuttlefish/default implementation"...
[automerger skipped] Merge "Fix deadlock in cuttlefish/default implementation" into rvc-dev am: d183abf8 am: 8f980a3e -s ours
am skip reason: Change-Id I70aec19a481781d924ed3008765ca624a7eeb950 with SHA-1 f3cb5562 is in history
Change-Id: I9c52510861741c2e0a2f48641097ace7dc91d87b