Merge "Revert "AML: Make MediaSessionManager.createSession() as @SystemApi""