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: Ica8bce8d13c5c1b71c6e3ba1ff982f18469d8321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>