Merge changes from topic "media_output_dialog" into rvc-qpr-dev am: 7de579f1ce

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7e7d3fa26ec863da2cd05800062871685b83c55