[automerger skipped] Merge "Fix output switcher will show 2 media session when remote playing" into rvc-qpr-dev am: d7cf95ef74
am: 436633ab5d
-s ours
am skip reason: Change-Id I80479d35b2bb2e353cf41f41f457f2dfd15cadbf with SHA-1 e16a8077b5
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13109544
Change-Id: I430e84b4a8c1b5ae9a4305509c750537a5ffcc45
This commit is contained in: