Merge "[Media ML] Remove hidden API usages from MediaSessionService"