Merge "Fix output switcher will show 2 media session when remote playing" into...

Merge "Fix output switcher will show 2 media session when remote playing" into rvc-qpr-dev am: d7cf95ef

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

Change-Id: I5ca519b1a3475afb9697bc76b20f550997afda2b