Merge "Revert "Revert "Ensure MediaSession is ONLY made active when routed to...

Merge "Revert "Revert "Ensure MediaSession is ONLY made active when routed to wired headset.""" into udc-dev am: 2ab0678e am: 142c6f7c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/22743179



Change-Id: I8dbf4e4ec00d2d88285e0798c20d9142b2338266
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>