Merge "Avoid refreshing the media output dialog UI while dismissing." into udc-dev am: 04c08fe3

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



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