Merge "PatchPanel: fix deadlock when creating a patch" into udc-dev am: 18d9ff46

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/22650163



Change-Id: I1f4b4702578537d94f8091cd2f45a66f56d9a4f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>