Merge "[MediaProjection] Address deadlock between multiple services" into udc-dev am: 607bd36f

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



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