[automerger skipped] Merge "Fix output switcher will show 2 media sessions in some use cases" into rvc-qpr-dev am: 9ccf19cb9f am: cbbc224e4d -s ours
am skip reason: Change-Id I2726a3deb397f646e4c74a8c445dde6fafb694a8 with SHA-1 3a7293cbbf is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13109545
Change-Id: Iae9edb41aed3f609cba43bb677baad53f38b3c53
This commit is contained in: