Merge "Prevent leaked receivers from MediaOutputDialogTest" into udc-dev am: e1e138fe

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



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