Merge "[Media ML] Replace user-related hidden APIs"