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: c772aaf5 am: bdef2781 am: 998ed159

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



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