[automerger skipped] Merge changes from topic "media_output_dialog" into...

[automerger skipped] Merge changes from topic "media_output_dialog" into rvc-qpr-dev am: 3cea72fb am: c93b70e3 -s ours

am skip reason: Change-Id I1038e237113f433c847aff98a45b1dd6089d80a8 with SHA-1 82d45fa0 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115230

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14386f71b47d402dd85c1f4e4b6ab8eddedc06fa