Merge "Revert "Ensure MediaSession is ONLY made active when routed to wired...

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

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



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