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: cd5b1b55 am: 8d6a4079

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



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