Revert "Revert "Fix overactive media routing""

This reverts commit 0aec178b7e66a29a22e90415faa15fb5f01aaef2.

Bug: 65376604
Test: manual and media cts
Change-Id: Ifd20848b406a1c51356c0b852274ba85b7062fdc
5 files changed