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 am: fe36b693 am: d4cd1c6c

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



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