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: f9020ee3

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



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