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

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

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



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