[automerger skipped] Merge "Fix output switcher will display previous media...

[automerger skipped] Merge "Fix output switcher will display previous media session" into rvc-qpr-dev am: 27a7be8a am: 0306995b -s ours

am skip reason: Change-Id Iebfc7904609e243d5bf0222307bae98a952a3331 with SHA-1 c3fe8d87 is in history

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

Change-Id: I4ced6e84f7f87c2114296c63fb1bbbf543121bf1