Merge "Merge "Avoid refreshing the media output dialog UI while dismissing."...

Merge "Merge "Avoid refreshing the media output dialog UI while dismissing." into udc-dev am: 04c08fe3 am: c772aaf5 am: 9cda33d6" into udc-qpr-dev-plus-aosp am: 2778d9ff

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



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