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: 37c4f9dd

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



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