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

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

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



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