Merge "MediaSessionManager: Apply API review"