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 am: e681031c

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



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