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 am: da89b742 am: 31fd50d9

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



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