Merge "Fix deadlock when notifyPhysicalCameraDevice is called while waitUntilDrained hasn't completed" into udc-qpr-dev am: 2894ae2e2f am: 3db880108f

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

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