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

[automerger skipped] Merge changes from topic "media_output_dialog" into rvc-qpr-dev am: 7de579f1 am: 81890812 -s ours

am skip reason: Change-Id I42506f065da687c4ba6ddadca0f3b7a1c55f1be7 with SHA-1 f1cacd72 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2743adb71d851a403d778a5c3b16b0295c12ebc