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

Merge "Revert "Ensure MediaSession is ONLY made active when routed to wired headset."" into udc-dev am: 8ff4dbeb

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



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