[automerger skipped] Merge "[MediaProjection] Address deadlock between multiple services" into udc-dev am: 607bd36f am: 91660e8b -s ours

am skip reason: Merged-In I9c21acf069c66f1ade22c49b095ad5339fe13eca with SHA-1 e871b1f6 is already in history

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



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