Merge "Prevent leaked receivers from MediaOutputDialogTest" into udc-dev am: e1e138fe am: 521fe281 am: d29107f6 am: e21cf3df

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



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