Revert changes for moving MediaSessionService into AML

Bug: 123000882
Test: n/a
Change-Id: I3d3bffa27916ccbe45bfa32517a4d06e043b9bbb
5 files changed