Merge "Revert changes for moving MediaSessionService into AML"